From ffc8ce29aaf1c054c11c2fc9baf4c4e134ec8ca9 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Thu, 19 Nov 2020 17:30:30 -0600 Subject: [PATCH] Call request.static_url directly from template --- src/pgwui_common/pgwui_common.py | 3 --- src/pgwui_common/templates/base.mak | 6 +++++- tests/test_pgwui_common.py | 17 +++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pgwui_common/pgwui_common.py b/src/pgwui_common/pgwui_common.py index 9508b90..5a76972 100644 --- a/src/pgwui_common/pgwui_common.py +++ b/src/pgwui_common/pgwui_common.py @@ -33,9 +33,6 @@ def base_view(wrapped): ''' response = wrapped(request) pgwui = response.get('pgwui', {}) - url = pgwui.setdefault('url', dict()) - url.setdefault('css', - request.static_url('pgwui_common:static/pgwui.css')) route = pgwui.setdefault('route', dict()) route.setdefault('home', request.route_url('home')) diff --git a/src/pgwui_common/templates/base.mak b/src/pgwui_common/templates/base.mak index 42d042b..2a38acb 100644 --- a/src/pgwui_common/templates/base.mak +++ b/src/pgwui_common/templates/base.mak @@ -46,7 +46,11 @@ <%block name="meta_keywords" /> <%block name="meta_description" /> - + <%block name="stylesheet_links"> + + diff --git a/tests/test_pgwui_common.py b/tests/test_pgwui_common.py index bab7ff3..4e3542e 100644 --- a/tests/test_pgwui_common.py +++ b/tests/test_pgwui_common.py @@ -29,18 +29,15 @@ pytest_plugins = ("pgwui",) # Helper functions and constants -CSS_URL = 'foo://bar/' +FOO_URL = 'foo://bar/' def mock_view(request): - return {'pgwui': {'url': {'css': CSS_URL}}} + return {'pgwui': {'foo': FOO_URL}} def check_base_view_results(request, pgwui): - assert pgwui['url']['css'] == CSS_URL - url = (request.application_url - + pgwui_common.DEFAULT_HOME_ROUTE) - assert pgwui['route']['home'] == url + assert pgwui['foo'] == FOO_URL # Unit tests @@ -51,10 +48,14 @@ def test_base_view_add(pyramid_request_config): def mock_view(request): return {} + request = get_current_request() + url = (request.application_url + + pgwui_common.DEFAULT_HOME_ROUTE) + pgwui_common.includeme(pyramid_request_config) wrapper = pgwui_common.base_view(mock_view) - response = wrapper(get_current_request()) - assert response['pgwui']['url']['css'][0:4] == 'http' + response = wrapper(request) + assert response['pgwui']['route']['home'] == url def test_base_view_default(pyramid_request_config): -- 2.34.1